Revision: tla-tools--devo--0--patch-54
Archive: miles@gnu.org--gnu-2004
Creator: Miles Bader <miles@gnu.org>
Date: Wed Apr 28 00:11:25 JST 2004
Standard-date: 2004-04-27 15:11:25 GMT
Modified-files: ChangeLog tla-fix-changelog-conflicts.shpp
New-patches: miles@gnu.org--gnu-2004/tla-tools--devo--0--patch-54
Summary: tla-fix-changelog-conflicts: Handle inline conflict markers better

Now if either half of an `inline conflict hunk' is completely a tail of the
other half, we suppress the duplicate lines in the second (`to') half.

This is intended to deal with the observed effects of `tla star-merge
--three-way' on ChangeLogs in some conflict-prone merge scenarios.
